Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: c220ad0  -s ours
am: 615381f  -s ours

* commit '615381f1a555b3a3d60998ca25f1e6c491d7f490':
  Import translations. DO NOT MERGE

Change-Id: Ied0b2a388792dbcd52f332ff7c779d40e95bab08