[DO NOT MERGE] Revert "Backport of ag/14170751 and ag/14170752."

This reverts commit 29d5f72db216eeae13cb7d395b2359544012ffce.

Reason for revert: b/188459357: fix a flaky test

Bug: 188459357
Test: m
Change-Id: If56ba00ed499322d7192163eb62fd01587baed92
3 files changed