Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 604e7bf03d  -s ours
am: d85342515f  -s ours

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

Change-Id: If4ba869419e85c3e77e3c9f37e6bd991b6aee6d9