Merge "Import translations. DO NOT MERGE" into nyc-dev am: 4a19326  -s ours am: 70219a5  -s ours
am: 82a9add  -s ours

* commit '82a9add658128cb9bdd9f7d94edb53df192e190f':
  Import translations. DO NOT MERGE

Change-Id: Id298daaf0b16f23238bd7577a890373484517169