am 9780f97d: Merge "Add more context for CHECKs"

* commit '9780f97d4864f33150407707e6ca09a8a7a20914':
  Add more context for CHECKs