am 87ccf114: am ae5624a7: Merge "DO NOT MERGE the HID device state is out of...
am 87ccf114: am ae5624a7: Merge "DO NOT MERGE the HID device state is out of sync after upair." into klp-dev
* commit '87ccf114':
DO NOT MERGE the HID device state is out of sync after upair.