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