Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 4ce8e19231  -s ours
am: 45f3daff68  -s ours

* commit '45f3daff689f33f3e20285112f981b219a598431':
  Import translations. DO NOT MERGE

Change-Id: I9219d9f062135c92555307ca3cd334614c3e082e