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

* commit '2130b287549b010b405bc72d04f07fb1bd070ba5':
  Import translations. DO NOT MERGE

Change-Id: Ib9e163aa0e74fdd6c9b22c292e9651d153e117a4