am 95e31ac8: am 3385b616: Merge "Added in flag to ask context to wait for debugger attach."

* commit '95e31ac85d4ba0b7dfb087f8bc0a10e4065ca8cd':
  Added in flag to ask context to wait for debugger attach.