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

Change-Id: Id6695de96ad887fa979b5ffa89d42b44890cd96e