Merge "Fixed a crash with the autocancelling" into nyc-dev am: 4a4b76f6e8
am: d4962867bd

* commit 'd4962867bd0a01e102315720d0d0cce41af98202':
  Fixed a crash with the autocancelling

Change-Id: I031b0c3ca48f93a4705d8dfd58c7b263e1e1953d