Merge "Add a configurable delay to the DMI stub"