Merge "Revert "Add new permissions to test"" am: 859879693e am: 70348eb476

Change-Id: Id8ac646c116e5dc331b7eb4e4876fbde07448c92