Clean cherry-pick of ag/3580901 Bug: 72871435 Test: flashed and verified, also ran runtest framework-net Merged-In: I177eff1237dd59514ccf91397a3d307148bc37b1 Change-Id: Ic5919a32f91f7baee5f1370703ad166e6ea52b58
Clean cherry-pick of ag/3580901 Bug: 72871435 Test: flashed and verified, also ran runtest framework-net Merged-In: I177eff1237dd59514ccf91397a3d307148bc37b1 Change-Id: Ic5919a32f91f7baee5f1370703ad166e6ea52b58