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

Change-Id: Ia2d5e05d5c889b2559fb047f71fcb26732e2810e