Merge changes from topic "apps_to_system_ext" am: 046d939399 am: 8d3f32ccdc

Change-Id: Ief9e852d88063c2519c940615fd47239b7d459e7