Merge "Fix null dereference in debug check." am: 5f3fa2f2c2 am: cacc56f02f
am: 5686d9690e

Change-Id: Ifac87d83db25ab76bc8bf9456ecc8ad7313f2f74