This reverts commit 8497789b. Reason for revert: This was fixed, see b/160796554 Bug: 160796554 Change-Id: I42f8d6b76c7319522239517ac3aff6eee7d9084b