DO NOT MERGE Implement suggested changes in API review for permission mainline. am: 6e84285bcd

Change-Id: Ic0ae6b5b5b88e114b818db8380ba1615dd0ecd07