Updating to use deferred cancel api am: fa652a8a4f
am: c0974870e4

Change-Id: Ifcab654d42c286c6d7288d219d2ad7b06cd249d5