Merge "Import translations. DO NOT MERGE" into nyc-dev am: 451dc7e  -s ours
am: 7527dee  -s ours

* commit '7527dee8ff5028b2f5ada26720410817060643d0':
  Import translations. DO NOT MERGE

Change-Id: I257cf6c3533e160d3e19228c576aa69281b81ed9