Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 0860f41afc  -s ours
am: 1d8f1bd0b2  -s ours

Change-Id: Ifbb72d371976b1dd1699a84afb318f1420caa0a8