Merge "Preserve old translations for changed strings.  DO NOT MERGE" into gingerbread