Merge "USB System UI: Fix string localization problems" into honeycomb-mr1