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

Change-Id: I2b9aef327cc6e5452aa7f3d7f2a83c6f7b82a6c2