This reverts commit 13bc31d6. Bug: 71694982 Reason for revert: Broke Mac build Change-Id: I0da6866442ca9273dd329f0b82932f939b7f65ed