Merge "Import translations. DO NOT MERGE" into nyc-dev am: c27bf8ea68  -s ours
am: 3f27b4a747  -s ours

* commit '3f27b4a747e3529f1f5501be56fe0e80a01752f3':
  Import translations. DO NOT MERGE

Change-Id: Ibf2e3351bc9606ab639b11a1f4ea0fa9b1d36833