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

* commit '3b7871c242bea5834c657c25fbb89c382566f66f':
  USB Manager string clean up: