Merge "Refactor hid command, mitigate overflows" am: 4d722cdbcd
am: a705c2534f

Change-Id: Ie2f0ff66e9aec5e8b11b25e412c3e051dffc4627