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

Change-Id: I76e05f0850240a1b39ade0ad8c9e20dd60a51f64