Merge "Add Group Id to PhoneAccount" into nyc-mr1-dev