This reverts commit 2b80ed48. Bug: 78652467 Reason for revert: ASAN tests failing Change-Id: Id4bba2711d8b69c0a64e3e8eb335a18facab9fdd