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

Change-Id: Id717ceb76ced6f3fb2b10689efd916e7e7cc5cfe