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

* commit '83378cb13689fa73be349a9ce4b0802ed64fc935':
  Import translations. DO NOT MERGE

Change-Id: Ifc6608f6a98af55eeb61362b87a4413d22eb748f