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

Change-Id: I5cd79b218ae51cef52f897b618b5979d017c24a2