am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos
automerge: 32ee913

* commit '32ee913c953fbd3c9c3359fbf031f412794e3178':
  Fix USB typos