Merge "Logging clean up: remove a logging API that nobody calls."