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

Change-Id: I486d8669bdf005a5d9e9864cc22a3cbb9406d03c