am 919e1c45: Merge "Document reentrancy and error conditions" into jb-mr1-dev

* commit '919e1c45b77b99c0215a53ab93d8032abb6d8c26':
  Document reentrancy and error conditions