612b124b75
This reverts commit aed3b14abc.
Reason for revert: This fix introduced other issues, see b/386304079, b/384731940
Bug: 319365581
Bug: 386304079
Bug: 384731940
Change-Id: Ib49975208888fe54dd8bfb8dc3815f8825c8b5e8