Merge change I8f61592d

* changes:
  Set the debug interpreter entry point properly on the self-verification path.