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

Change-Id: I8a446d3a47db4c97e7292a8b6322a12013807813