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

Change-Id: Ib2d64e668d8916f487c1260680bda7bd27ba0100