Merge "Import translations. DO NOT MERGE" into nyc-dev am: cb8c569414  -s ours am: 977d5bbfd2  -s ours
am: adab7c9693  -s ours

* commit 'adab7c9693f491ebc6121c9b253dc3a1f98816db':
  Import translations. DO NOT MERGE

Change-Id: Iac3290e9b655039bbbce5bdd9ac07130f870c905