Merge "Manual cherry-pick of "Update permission usage for M"" am: 4e9bcb71eb
am: 5dcaddb516

* commit '5dcaddb5166e5473925a374bd169aa025df0da10':
  Manual cherry-pick of "Update permission usage for M"