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

Change-Id: I17a1beb48aad1e8744ecfab50791267ee972b971