This reverts commit 8f5e6f8b. Reason for revert: b/289170037 Change-Id: I00454e39203b375b35423b2d31418f63ed93927d