DO NOT MERGE Implement suggested changes in API review for permission mainline. am: 6e84285b am: 80c906f5 Change-Id: I9e1957e8b7e6608e236263cef67da28e6f7b8163