Merge "Import translations. DO NOT MERGE" into nyc-dev am: 39884131c0  -s ours
am: c8b42d6674  -s ours

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

Change-Id: Ice488d8b930cdf4d79937d459c77bcee21fe6084