Change-Id: I7e0a6d457aa26748758b6402955c81eae2c94782
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>