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

Change-Id: I5bf1a9de6b0539b8115fb89c738ef903736c9cb4