Change-Id: I80bc3f21eec194580adf0e82bd0429e5ae27ad51
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>