am afcf2a26: Merge "Restore LOG_NDEBUG condition on verbose logging."

* commit 'afcf2a267f10d8aa4b1bc1fc7ea5fe48e314e68c':
  Restore LOG_NDEBUG condition on verbose logging.