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

* commit '12d1f5d5c0d9c1fbff66bd838c5d534893fba686':
  Import translations. DO NOT MERGE

Change-Id: Ibf1708ca58c41463210831363d4aa667a305a193