am d8ad2fab: am 40461ee7: am cd556b82: Merge "Instead of asserting, signal a runtime error if the session doesn\'t contain" into ics-mr1

* commit 'd8ad2fab90b4f6eb50ba9c45e140811bad848384':
  Instead of asserting, signal a runtime error if the session doesn't contain