Merge "Add new permissions" am: 62ace8c46a am: c0f9b27214

Change-Id: I2114c613729f0d84d773b7e8b58402cda302a8c8