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

Change-Id: I509d6e3ec4b4b2edd5b9e340241f8babd247c5f7