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

* commit '2ebc0853d34c5834deff492da26740950fbf7cb5':
  Import translations. DO NOT MERGE

Change-Id: Id6c828cd49caa9aa828330ee374ecf128db9b7dc