Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 5854f2aa07  -s ours

* commit '5854f2aa077e5ceba2977724f71162eaf3faa384':
  Import translations. DO NOT MERGE

Change-Id: I565899541685a2f1951c35d8a07b4f29ca5eae3e