Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93bc210b3f  -s ours
am: 373ad6f5a1  -s ours

* commit '373ad6f5a1f0e98516a713423302b73a0d82f191':
  Import translations. DO NOT MERGE

Change-Id: I5498cfed6c0e6e4453c38b1f81969d9ca4e1c4b2