Merge "Rename permission APIs."