Merge \"Add group Ids to facilitate Merged PhoneAccounts\" into nyc-mr1-dev
am: fa751b0b92

Change-Id: Ia474c5192e9726771857cf230e05ace5bbf9e80b