This reverts commit d483fa5b. Reason for revert: b/272536386 Test: ABTD Change-Id: I2115f086722d0ed22864c63e7a9689931ded654d