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

Change-Id: I27d6736b64df7e2887de545008d99b1bb5418049