Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 7e212ae873  -s ours

Change-Id: I74f96038ba9a074e9359ae90a14eb6d756f91724