am 64788f1b: am 67d9e0be: am 0cc37f4c: Merge "Fix debug context."

* commit '64788f1b6857c87a14e67044f51c2405195b407c':
  Fix debug context.