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

Change-Id: I09bbb5157c9e43f348cba855db6430245c525c54