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

Change-Id: I58eb9a9f1e1eb2e7e348bd274b09d481333d0168