Merge "Recover vdex regression on multidex." into oc-mr1-dev