Merge "Import translations. DO NOT MERGE" into nyc-dev am: 03add50400  -s ours am: 092f25cd15  -s ours
am: 0d58ae2cc7  -s ours

* commit '0d58ae2cc7b9d22c9e842979a67c51f7811e6418':
  Import translations. DO NOT MERGE

Change-Id: I55f3e7ac9a152c1d42a491543b6af555e9405a1d