This reverts commit 6c588296. Reason for revert: b/264827343 Change-Id: Iba5a4924349a90349a1e56181efb2d368444dfac