Revert "Reland "Cover more cases in nterp.""

This reverts commit f375e929ade0898a6d7d8f6b2071805808c4357a.

Bug: 112676029
Bug: 157658616
Bug: 160543640

Reason for revert: Breaks wifi tests.

Change-Id: I261b11ef59c22581b1be17e2c09a113adc2f0f5d
4 files changed