Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev
am: aef6baae73  -s ours

Change-Id: Iab9e7eccc28ba4c4ee139351a8cbb45b491ff3ef