Refactor argument parsing in ota preopt am: 315d1f5438
am: 1c4e789655

Change-Id: I467d5d810b775d9b4f01111c02f0973fefffb069