This reverts commit c37838eec8. Reason for revert: b/296247274 root-cause fixed Change-Id: I859e7500a1dd09e3a66986cda9e62adf5d7a524a
c37838eec8