Merge "Import translations. DO NOT MERGE" into nyc-dev am: 52edfafb9c  -s ours
am: 7d627e9cf0  -s ours

* commit '7d627e9cf08e2f827ca6de619a728fecce57c6ff':
  Import translations. DO NOT MERGE

Change-Id: I75a2eb02c5ea1f26186f65a524942e2227908099