Merge "Merge textclassifier/logging/ into textclassifier/" into pi-dev
am: 9554dd94ec

Change-Id: Ic4f3b315e6afb94cdeea6b057af2fc84379f2b07