Preserve old translations for changed strings.  DO NOT MERGE

Change-Id: I7ce80a0d57a6ff09dd12abab5ba6df9019d740ca
20 files changed