Merge changes from topic "apex_migration" am: c29a5cf115
am: f17cec022f

Change-Id: I4d8193a9f6bba48b4d167a4cdbaaf80d6280f472