Merge changes from topic "Group ID"
am: b659e1be77

Change-Id: I9e0c2eb3a1dec4bb505e7354744a5230bb61f303