DO NOT MERGE Reworked additional permissions fragment for each app am: 6dfb1f6553
am: 18817ebb89

Change-Id: I5f2254900247fda33ca2b48b38428f01ef11b914