Merge changes Ia2ab6b67,I85a9ef21

* changes:
  Update ConnectedDeviceGroupController
  Add infrastructure for connected device group.