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

Change-Id: I6a541011024253f7b7f5f5207294cf1bce60a4f0