Merge "DO NOT MERGE Implement suggested changes in API review for permission...
Merge "DO NOT MERGE Implement suggested changes in API review for permission mainline." into rvc-dev am: a865f9e1 am: f3c712e4 am: 2ea481e1
Change-Id: I52cfdcefae52ce09b6670b2d1dadc12fb96049ac