Merge "Cleanup USER_OWNER in pm"