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

Change-Id: I97a96da052f14ecd9901ef7aee42cfdbaf284cbf