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

* commit '9d5c33c58451aac8566b8df8426265cedd3e610f':
  Fix build break with missing VDBG.