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

* commit '4a19326d9166f02b01f341ef338ee88ef29335bc':
  Import translations. DO NOT MERGE

Change-Id: Ia8930286364cdbcd8105866eb0e2506abd00fda4