Adds ClientDeviceListeners.
Merge "Adds ClientDeviceListeners."