This reverts commit 11514a90. Reason for revert: regression: b/296441848 Change-Id: Id433af188e654885c5d9ff024d68a634ab931aad