Merge "Update to use the correct library for logging."