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

Change-Id: I2c73b3824bd0fdcb3628e71c641b811202d26d2a