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

* commit 'fefedb0f45b66a39cc7e11b828bbb03758270635':
  Import translations. DO NOT MERGE

Change-Id: I1d0f28b21d0e4bb4000296abc7736fc3f2b05705