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