Merge "Move all logging to use the async safe logging."