Updating to use deferred cancel api
am: fa652a8a4f

Change-Id: Id4beffd24f16863dd5f6f72b2dca923f4c54745b