Set defaults directly in option processing

Change-Id: Iaa327862fc9e43aade2dd1ed66aa27f335f12ac7
Merge "Set defaults directly in option processing"