Merge "AsyncTask terminating with exception calls onCancelled" into nyc-mr1-dev am: 647625fbf8
am: ab32ca193e

Change-Id: I2d7265d9cd0da6f756c8c18a9f792c209c892cc4