Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1d77757fb5  -s ours" into nyc-mr2-dev
am: a22445abae  -s ours

Change-Id: If06e22ea49de21de8d0243174481425bf6eebe00