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