This reverts commit d119269c. Reason for revert: b/124792601 fixed Change-Id: I8603231042b0e70772fc174f5493db4ef0587323 Test: bionic-unit-tests Bug: 122993569 Bug: 123241361