Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 6cffa2bf95  -s ours
am: 4049f7d326  -s ours

Change-Id: I3c97413d9abd91d7d9bf7c1b02f5a0e3e47bfb3b