This reverts commit d07c2dea. Reason for revert: debug test failure in b/158986168 Bug: 158986168 Change-Id: I10cb613e4f160561c06944aebccaf16c090bcd9e