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

Change-Id: Id76b78032b01aed87ff6b203d44c09324aefea62