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

* commit '48d780c4be36bc325be92f1f7b7d971d1d1209a0':
  Import translations. DO NOT MERGE

Change-Id: I63d467614d0540cb4b86b164b550f806cf3db125