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