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