They may contain spaces and other things confusing the
watchmodel.

Change-Id: I87932b342de5e1b29c75ed921d4d6afddf4d51da
Reviewed-by: hjk <hjk121@nokiamail.com>