Merge "Ensure dexopt is executed only with consistent package data" into oc-mr1-dev