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

Change-Id: Ie715aed27dae619de572006fe4a37210ac4cf21a