Merge "Import translations. DO NOT MERGE" into nyc-dev am: 05be3b4541  -s ours
am: 1a49e73d2a  -s ours

* commit '1a49e73d2a222b9d74381651f44cb57f040b2163':
  Import translations. DO NOT MERGE

Change-Id: Id3d70f4a031896490a40c395f882f626719b54d8