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

Change-Id: I8c75997247b73ca0c6856f5ba14587f1da01638f