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