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

Change-Id: Ifbc89fe764b8b4f3531d0b4d838bcb7e689e86d4