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

Change-Id: Ic87bbd0ad342f02b9b89f7460f95785479182cce