Merge "Add group Ids to facilitate Merged PhoneAccounts" into nyc-mr1-dev