Merge "Update to use the correct logging library."