Merge "Fix a compile error when debug is turned on"