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

Change-Id: I138bd5f7114a952632587b5c6089e153c9cd4ea2