Merge "Fixed a bug with auto cancelling" into nyc-dev am: a35d9b3ee0
am: a6a27fb71f
* commit 'a6a27fb71f84f822dd8bdb4f1fd84a1b3bd01efb':
Change-Id: Id3cd3ab84a7caa95d5e4fcc5705ab8acbc0a23dc
This commit is contained in: