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

Change-Id: I7e2c5d5ea83dfce16529ef041f06ee18d5a16a11