am 0cc37f4c: Merge "Fix debug context."

* commit '0cc37f4cdeaed95e4f61f1a6e7b78f07e7025e97':
  Fix debug context.