This reverts commit b7a9a2b7d5. Reason for revert: Crash resolved by Ieb07b5bbc206f07f69e4afba921149f49d6fe8c4 Bug: 349870098 Change-Id: I49848f6e7311c1f44e6c988cb42107ed79da3a6b
b7a9a2b7d5