Set the argument required flag for relevant options

Change-Id: I841fa37487a945da0b13994a556c2a6d4b013604
Merge "Set the argument required flag for relevant options"