Prepare for netboot fix(following patch). No Functional change.