[automerger skipped] Merge changes from topic "Group ID" am: b659e1be77 am: 6f9398daaa
am: 121f1cba7f  -s ours

Change-Id: Iafe2aaeb7a951a06b9638c6b4a9ba41ed1021c55