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