Add proper support for canceling sessions.

  Bug: 19384186

Change-Id: I45b0262947dcd4257d54e706f3cffc69b6bd4bc9
10 files changed