Merge "Fix permission descriptions"