This reverts commit 096c090b80. Reason for revert: crash is fixed in this change Bug: 202510128 Test: manual, build Change-Id: Ifff8d58cfdcf43e123b11dee308665b2617cb4b3
096c090b80