Merge changes from topic "apks_in_apex"
am: a8ce56e23f

Change-Id: I0373f86833f35ed61c3138d8f26d63667db03d7f