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

Change-Id: Id7a79cc463019f707f0c1fc5ff686edef6acb1fc