This reverts commit 462703c850. Reason for revert: b/375535923 Change-Id: I7f77959490e8243bb95985bd28b67efcf0f3eb00
462703c850