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