Preserve old translations for changed strings.  DO NOT MERGE

Change-Id: I64023ad34cba22133fd355ed4d885b3f831c5aa1
20 files changed