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

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

Change-Id: Ic3bc3a9af1f6ef9870ee65abf6badfa95f576d0f