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

Change-Id: I23edb718f428d1fa25e28190ba131d7094f19bf0