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

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

Change-Id: I6d62d53ce713437a20d425419e08c11140154977