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

Change-Id: Ia26f0fd7cf8f1c0937fd5b42fed1c8aee22111e0