Merge "startop: Re-enable iorapd presubmit tests"