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

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

Change-Id: Ie1e07bfcf50990c7511102f72eaa8520f530e66f