This reverts commit 1653a5082d. Reason for revert: b/406789714 Change-Id: I3c43ab802d327e030b0e9473cd81e52ee2d7e028
1653a5082d