Merge "Strings for new import dialog" into honeycomb-mr1