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

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

Change-Id: I71387396ef355b697906b365d1ae9df37e96d018