Merge "Rewrite handling of oob priv-apps in framework."