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

Change-Id: I8193a10bef4d829f41fd2609b571c9fa52365783