Change-Id: I33556b0296a85c8321d785dbe819fcac98d0afb1
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>