This reverts commit 88885b0e. Reason for revert: b/274401776 Change-Id: I7b7f5c26240c8d4155cb6aad945f14a6724725c0