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

* commit '7b6dd72c567ec3ddb3bc896f8d7e38de27f07999':
  Import translations. DO NOT MERGE

Change-Id: I35da3b25e53f29f6072257665373c452217ce9ff