Merge "Add Group Id tracking in PhoneAccountRegistrar" into nyc-mr1-dev