2a1946ee65
This reverts commit ca39594be9.
Reason for revert: Potential fix for b/378007383
Bug: 376428479
Change-Id: Id38db589e9e11220237314a0f1c63178899714de