This reverts commit 9c94a64e. Reason for revert: b/254332635 build falure Change-Id: I4ed1f59fd28ac7bb60939a10d15311cb7a5bfa42