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

Change-Id: I786833b8c5ee7b27a942209bc15cdca70b9b8335