Merge "Fix string comparison in otapreopt." into main