Merge "Import translations. DO NOT MERGE" into nyc-dev am: 072150db89  -s ours
am: 998797a27d  -s ours

* commit '998797a27d026a0b79dc1fd1fcb6004a35799228':
  Import translations. DO NOT MERGE

Change-Id: Ida92a6743226c1c95cd8531012a3c953a0c0a7bd