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

Change-Id: If96f86dd128b899982a82f27a54b3682c86123b0