Merge "Control privileged permissions for priv-apps"