Merge "Otapreopt: Fix patchoat delta parameter" into nyc-dev