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

* commit '8ee4d558436de3e268d4e29cc3562bccfa7b5167':
  Import translations. DO NOT MERGE

Change-Id: Id107e9b2fc4eb6762057be617edf92fb6ffcdc77