Merge "Add AsyncTask to compiled classes" into oc-dr1-dev