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

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

Change-Id: Ic8e7ec8ac19bab356a27d22feb01092e974e43dd