This reverts commit d0500f10. Test: m Bug: 305277519 Change-Id: I126395d32cfc0048b6403c831613d9b4a178af4d