Reason for revert: This caused clang linker crash in several branches. Bug: 77581732 This reverts commit c9dd2207. Change-Id: I1923809083cf41c4f19e3e60df03ae80517aaedb