Merge "Remove more profile_owner policy refs"