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

* commit 'b731377822c212b7742cdf61fac918a30f12a1b4':
  Import translations. DO NOT MERGE

Change-Id: Iace74dcddc9eed1ec24d055a108093cf835c97ae