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

* commit '4a4b76f6e842a4578dffedb2800d2b8eca813769':
  Fixed a crash with the autocancelling

Change-Id: I09e52b5ac392edaae7f42c7cb1903f60421b03bc