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