bug: 71807569 Test: Manually tested and verified no longer crash Change-Id: I9b6a20377f2cf7ffb9be12de7bfa59f8b1063625