Merge commit '94c9db5485bb36734f10592241cbab060f8f7fb3' * commit '94c9db5485bb36734f10592241cbab060f8f7fb3': Refactoring the logging interface to remove dependence on NPP.
Merge commit '94c9db5485bb36734f10592241cbab060f8f7fb3' * commit '94c9db5485bb36734f10592241cbab060f8f7fb3': Refactoring the logging interface to remove dependence on NPP.