Merge "Updated champ-lib to use the correct logger"