Merge "test(spm): using SRI delay flag from NWd"