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

* commit '4e9bcb71eb88de0e4d91b126e31925725f7c483a':
  Manual cherry-pick of "Update permission usage for M"