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

Change-Id: I00f0418ff736f2cb861ae7f1339f9ed477215b74