Merge "Refactor argument parsing in ota preopt"