Merge "Import translations. DO NOT MERGE" into nyc-dev am: 9058fc71c2  -s ours am: 05d64fec0f  -s ours
am: 568999a110  -s ours

* commit '568999a11067ee624959797504ca575aaa325184':
  Import translations. DO NOT MERGE

Change-Id: Ibf81f56e707b1a230c7fa368674e60dce50298e0