Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 8ad820ef54  -s ours
am: 2f09a29ad7  -s ours

* commit '2f09a29ad7c83e94ca357e28ce75ceb4b3d6b183':
  Import translations. DO NOT MERGE

Change-Id: I738435eb28c1a676d6791aea2da7107039180421