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