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

Change-Id: Ida9f9921178ed0e5a14eaca432d1ba4a8959f636