Merge "Merge textclassifier/logging/ into textclassifier/"