Merge "Deprecate AsyncTask" am: c26568d8a7
am: e668533570

Change-Id: Ie20907c3cab97732c77a4e448cf9686d4e26df91