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

Change-Id: I5f81a5beacd58d17fff694bc76987f7bf580a55c