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

Change-Id: I828e11d0d99cf7f5081ab3e4ea67d86dc6d44e9f