Merge "Import translations. DO NOT MERGE" into nyc-dev am: 10e29e0730  -s ours
am: 27bdfbf794  -s ours

* commit '27bdfbf7946eb3e3b760169f85189168eebe60f6':
  Import translations. DO NOT MERGE

Change-Id: If07970d05f867718116d0c3aebebad92a9840a12