Merge "Fix AsyncTask to handle exceptions in doInBackground" into nyc-mr1-dev