Merge "Import translations. DO NOT MERGE" into nyc-dev am: 9aed8c2fa0  -s ours
am: 02befc3229  -s ours

* commit '02befc32293351a93a1ba073ff884e6135c0c121':
  Import translations. DO NOT MERGE

Change-Id: If60580203a307385c138d41f41790e8ca3852120