This reverts commit 383b0006. Reason for revert: b/260695808 Change-Id: Ic2f6b57534f393731e40c210f3b7b00b7c1fa6b8