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

Change-Id: I73dc7aa098c0a4cb4c58371088c2aa0661ecdc41