Merge "Import translations. DO NOT MERGE" into nyc-dev am: 4a19326  -s ours
am: 70219a5  -s ours

* commit '70219a5b72be2d5ddca22667114351f236d0e19e':
  Import translations. DO NOT MERGE

Change-Id: Ie294f7428c8a644f557997d4188d46e0e3246a12