am f19abb67: am 8e4dde2c: am 2ad03d0c: am c1aebfa0: Merge "Clean up USB Manager and fix ADB." into mnc-dev

* commit 'f19abb67c2604c06b140979cb527c599c37d02f4':
  Clean up USB Manager and fix ADB.