Merge changes from topic 'HID-Client' am: 8a74d0440c am: 59d63e8b1d
am: e11c3f6657

Change-Id: Ie63297ebe01de04c6e40c2ddae616c8d5c70a025