Revert submission 26593083-lassen_pps
Reason for revert: Culprit for test breakages in b/331680556. Will be verifying through ABTD for confirmation and before submitting the revert.
Bug: b/331680556
Reverted changes: /q/submissionid:26593083-lassen_pps
Change-Id: I97e29eaf09238d708fb9d941a5988ad42d583655