Merge "Import translations. DO NOT MERGE" into nyc-dev am: 072150db89  -s ours am: 725ce2bc3f  -s ours
am: 5ba2ce6bc1  -s ours

* commit '5ba2ce6bc1a7c7357008a3a7fe4f0d0a491faf71':

Change-Id: I610182a8e75a632ec8f03c6e767c51733d08ecac