Merge "Fix App Ops permission mapping structure."