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

Change-Id: I51ee786f03d8ad92dcfc740c5a55914bc7f16c4a