am 7d400ead: am 9d5c33c5: Merge "Fix build break with missing VDBG." into klp-dev

* commit '7d400eadb7340c139f35263f43fe3418d402f409':
  Fix build break with missing VDBG.