Merge "Import revised translations.  DO NOT MERGE" into honeycomb