Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: a0980e58e4  -s ours" into nyc-mr2-dev
am: d230d7d15d  -s ours

Change-Id: Icde90b1f0b61ae5b331307b26b5b7ff1836f9022