Merge commit '4e3e50cfa7cf02270ed0dd454d5c51bf7065bd14' * commit '4e3e50cfa7cf02270ed0dd454d5c51bf7065bd14': Clean up the last two literal permission string usages
Merge commit '4e3e50cfa7cf02270ed0dd454d5c51bf7065bd14' * commit '4e3e50cfa7cf02270ed0dd454d5c51bf7065bd14': Clean up the last two literal permission string usages