This reverts commit 54549163. Reason for revert: breaks tests, b/73997494 Bug: 73997494 Change-Id: I122c260898277d876c019554cb92351ac13a9eb0