This reverts commit a6488cc2. Reason for revert: b/270659234 Change-Id: Iae919aad0ad1d0e5c69f6a7d046ef7dc05a3fdbd