Merge changes from topic "apks_in_apex" am: a8ce56e23f
am: 62637979e4

Change-Id: If7e4d5408af91a6c0976568c9625622b4432a71c