am 94c9db54: am c3e20af0: Merge change Ib16749e2 into eclair-mr2

Merge commit '94c9db5485bb36734f10592241cbab060f8f7fb3'

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