This reverts commit 07e8cce9. Reason for revert: Test is flaky Bug: 72170747 Bug: 123052350 Change-Id: I08dcc755f1eaae14e2c9bf21df879f3737015a02