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