Merge "Merge textclassifier/logging/ into textclassifier/" into pi-dev