SM-1 fix errors made in forward porting net-physical
(cherry picked from commit 086286223e6e814c3f8036fccab7ba58657000e7)