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

Change-Id: I2ca0a1321763042be06e780dd89902810769ee3e