Merge changes from topic "Group ID" am: b659e1be77
am: 6f9398daaa

Change-Id: I775d5914fe8063db5cc7fbd72d676edecd8f7906