ccddd71c88
This reverts commit ccc10128f1.
Reason for revert: the underlying issue will be fixed in b/279873859
Change-Id: I37d4c16bc907fd31ef983d3c6974b3376543c3ce