Merge "Special handling of priv-apps in PMS."