Merge "Move priv_app policy to private"