Merge "Import translations. DO NOT MERGE" into nyc-dev am: f2a87aa  -s ours am: 6e1f3bd  -s ours
am: f500397  -s ours

* commit 'f500397a22c86399628c659d23165587d88b43c0':
  Import translations. DO NOT MERGE

Change-Id: Ie7556dd489185008181de7220ccd98e1cadf3be4