Merge "Import translations. DO NOT MERGE" into nyc-dev am: 1c25c67a6a  -s ours
am: 919ba24275  -s ours

* commit '919ba242758481c88d5372b909f95ed7883ee0b8':
  Import translations. DO NOT MERGE

Change-Id: I4f0110655c2d73b30539dc4a1ff58f07c864bfeb