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

Change-Id: Ib33e112eda5af530b41bb65ad393e2f9b61ac6c1