This reverts commit cf0501e4d7. Reason for revert: b/317462033, it seems a flaky but revert it first. Change-Id: Ie1d5e279cca6477fc17d8c27c1ecda8d7a6b2553
cf0501e4d7