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

Change-Id: I231af859adb5f02f8d7ead3f568eaaee152349be