Merge "Merge "Fixed a crash with the autocancelling" into nyc-dev am:...
Merge "Merge "Fixed a crash with the autocancelling" into nyc-dev am: 4a4b76f6 am: d4962867" into nyc-mr1-dev-plus-aosp
am: 2bb3e376
* commit '2bb3e376':
Change-Id: Id8c3107bb5601f79121492b2029bf2293c5291e3