This reverts commit df99184a. Reason for revert: Crashes settings - b/73440274 Bug: 73440274 Change-Id: I529874a6110e04d6b5b7723906a03330cd637d1d