bc67694c26
This reverts commit deefa3db71.
Reason for revert: b/406603025
Change-Id: Ifb770dd1e7e38946fe0ee02779dcb315023e392e