This reverts commit 99119cbc. Reason for revert: fixing apct/device_boot_health_check_extra breakage Bug: 164544701 Change-Id: Ib0aa74d53a614eaf51dc0859cbd434e0a0913344