Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 4408ea334a  -s ours
am: 32414cd240  -s ours

Change-Id: I076e8eef623604aaebf345cd1f7cfdef38831f04