Merge changes from topic "apex_migration"
am: c29a5cf115

Change-Id: Ifc8a986f9daf4ed0bffc901b7ab09afef0355f99