Reland^2 "Cover more cases in nterp."

This reverts commit dd5db458831cf74ae5813d2278fbd599145c4522.

Bug: 112676029
Bug: 157658616
Bug: 160543640

Reason for revert: Fixed missed class initialization.
Test: wifi tests, run-tests

Change-Id: Ie0a8ae0e92587b5c86203228615534526df640fb
5 files changed