This reverts commit 9d14dbe8. Reason for revert: Likely broke tests Bug: 188176340 Change-Id: I0c786e792322f7350b3bb16018ccb39e77a276a2