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

Change-Id: Ib01420e8a0b59fe10f75116278ccec8eec99cce3