Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93bc210b3f  -s ours
am: 6c4a3962e7  -s ours

* commit '6c4a3962e7090451da516c56a6da0b3c816e046d':

Change-Id: Id92c6f1f23c7f97d5c312a1df8910b5a30bede61