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

Change-Id: I8d71e07e06e8ae7b4cd5914786c2d61577f14e52