Revert^2 "Fix NPVCTest"

This reverts commit 6fcbed0ca2e95cb74fda0dd633d7a0c65313cff8.

Reason for revert: b/341339424

Change-Id: I9deb4d4f4d39115757d3cecd7d69e7d78dfaf389
3 files changed