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

* commit '31cd8615b2cd7cf04e00a87c7981264c1b180356':
  Import translations. DO NOT MERGE

Change-Id: Ie488bbdd015ab61b80505a10a03d1cf99e1b838e