4da65e47e4
This reverts commit af83003826.
Reason for revert: b/406789714
Change-Id: Ib19011cdff3406bb7cf02c0ecbcef81ae0fa6036