Merge "Fix DebugContext test."