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

Change-Id: I7fcaa6ea865885d085284c58ccb71a29f275020b