Merge changes from topic "apex_migration"
am: 8eacf37ef3

Change-Id: If897274a7d2b9258142a55a628525821d713af4b