am 95b3568d: am 42955bab: am d8b4dd95: Merge "Fix most logging macros for context pointers."

* commit '95b3568d38c65f556a59aa6e8e35c3e8ef14c356':
  Fix most logging macros for context pointers.