Merge "Import translations. DO NOT MERGE" into nyc-dev am: 47a7899  -s ours
am: 06be362  -s ours

* commit '06be362ec79fb26658c3afca710c7d11df5f23de':
  Import translations. DO NOT MERGE

Change-Id: Idd0e7153210df855be92d788c6a0d90222f69826