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

Change-Id: I98c68abf6c4b81af8dc1a2bb31a7ba5c586673fb