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