am c9b82ebb: am 3b7871c2: Merge "USB Manager string clean up:" into honeycomb-mr1

* commit 'c9b82ebb97411cf4a8494dc83f57039bb77937c5':
  USB Manager string clean up: