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