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: 59f9a0ec am: af2d200f
Change-Id: Ic4a76f9d9c706a63bf74be7ca1cc036da3da1494