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

Change-Id: I116a55d874311421552a35e4249750feebda85dc