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