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

Change-Id: I891dc2d4f99ac46f225837b9a71013ad8ff142c7