Merge "Manual cherry-pick of "Update permission usage for M""