Merge "Import translations. DO NOT MERGE" into nyc-dev am: a68d1f10e2  -s ours
am: 5c2575071e  -s ours

* commit '5c2575071e95e8efbb73f1a78f8dc382eda6e453':
  Import translations. DO NOT MERGE

Change-Id: I876ee6b17f993d8ef7ede529c8bf7118abc80439