Merge "Fix issues in the new permission & app op subsystems."