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

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

Change-Id: I6d86433b0a9ad80d60a469c441d6632caa20ac46