Merge "Rename PERSON_USER_LOCAL and PERSON_USER_REMOTE"