Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev am: 9f7b9a8352  -s ours
am: 07225a0fa0  -s ours

Change-Id: I8cb8a8845afb2139cb359dd6e96e3a34089092df