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

Change-Id: I4593fb756b4ef79571712e707fcaeadd7da14968