Merge "Third batch of permission in-process API refactoring."