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

Change-Id: I424b612a05c5586cfc9050f07188ed5bcc9d2873