Merge "Fix short description and name values for PhoneAccount."