am 621b6bfa: am e62ce17a: Refactoring the logging interface to remove dependence on NPP.

Merge commit '621b6bfad10237b0ed3fdcb31a141df1dd7b8916'

* commit '621b6bfad10237b0ed3fdcb31a141df1dd7b8916':
  Refactoring the logging interface to remove dependence on NPP.