Merge "Change permission message strings for clarity"