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

Change-Id: I238d40738960c266855c12ba48b9252048f4ed76