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

Change-Id: I73ba26823b2c27cf1f492558bf6b7c176c296282