Merge "Add AsyncTask to compiled classes" into oc-dr1-dev am: 19b979ca85
am: bb0dff9917

Change-Id: I38e2e2bbdfaa2d535b5f71c3d2a007fe3f52d075