Merge "Fix number of arguments in otapreopt v4"