Merge "Deprecate AsyncTask" am: c26568d8a7 am: e668533570
am: 0afcd8f4df

Change-Id: Ic43d6f6f8f3ffe2f932af4aa677824f2ef509d30