Merge "Rename PhoneAccountMetadata to PhoneAccount" into lmp-dev