Merge "Remove references to NV reset APIs" into main