Merge changes from topic "apps_to_system_ext" am: 046d939399

Change-Id: Ife87444eca0b114bd8a8d5c4bdc4ef08e872fd72