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

Change-Id: Ic325de894808a37cedb4ed0ecdc8d18982983813