Merge "DO NOT MERGE Implement suggested changes in API review for permission mainline." into rvc-dev am: a865f9e172

Change-Id: I2ff69d230eed917134afbc3faea1162d09f58c00