[upstream] Roll the nss standalone patch forward.