Merge "Add CHECKs to help diagnose a crash seen internally."
am: 740c300817

Change-Id: I298a683e68ba6b848c89133e468a320a5a951f8b