Merge "Change API for setProfileOwner to require userId"