am af212b2a: Merge "Fix log debugging includes"

* commit 'af212b2ae99691f76453cafb49e5629835e0648d':
  Fix log debugging includes