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

Change-Id: I2d3533869005160f27b38005a43b6cf85e1938d4