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