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

* commit '6a983faab35cc4f22611b0cb8041f4dcbac545dc':
  Import translations. DO NOT MERGE

Change-Id: Ibafdfdf355699c6a8d8461928400639e692500b2