Merge "Fix most logging macros for context pointers."