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

Change-Id: Ic2af52ea4156e11d19ae5ded4e86a7163d876903