Merge changes from topic "apps_to_system_ext"
am: 046d939399

Change-Id: Ie83ca6f8d5696cf5bc0f682cdc90b5e3ea03cedc