[automerger skipped] Merge "Refactor hid command, mitigate overflows" am: 4d722cdbcd am: a705c2534f
am: f89f51f76c  -s ours

Change-Id: I73fc3aaaa7ddcf8fca4b39aa4000c067b5041556