Merge "Enlarge the buffer for otapreopt commands." into main