Merge "Merge "Fixed a crash with the autocancelling" into nyc-dev am: 4a4b76f6e8 am: d4962867bd" into nyc-mr1-dev-plus-aosp
am: 2bb3e37630
* commit '2bb3e3763021b14597e1addd9ef7a3e1ecf911d4':
Change-Id: Id8c3107bb5601f79121492b2029bf2293c5291e3
This commit is contained in: