Integrate crash fixes

Bring in cl/355393342, cl/355399665

Bug: 179175447
Test: manual
Change-Id: Iaff65f6c0da9f063f5311ac8a3a94f2df821e909
2 files changed