Change-Id: I7a20eebadfda65aa68c1ff4f19c55b8a5e36559a Reviewed-by: Daniel Teske <daniel.teske@nokia.com>