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

Change-Id: I2688851beb78619270d8cb6dc077992b9cec037d