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

Change-Id: I1ba0b3e59f30b47a0e9a748121d8c3974b1c9aa1