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

Change-Id: Ie97a72b89d17e982dbe499c26c956dafffe5effa