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

Change-Id: I25058d9c3131588c724233d1d9faafad9f4104d6