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

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

Change-Id: I2f1a8efeae40a519b0fa2fcdab6561ce78cc9f5f