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

Change-Id: I97c915d738109cad16709301bb6624af098a64eb