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

* commit '498f780f42d39906ef634abada86eb750ce24fbb':
  Import translations. DO NOT MERGE

Change-Id: I337ee1c7c33a89158126caa18813642e954229e5