Cleanup for Sahara fields

Since 'True' is the default value for 'required',
additional assignments are not needed.

Change-Id: If79dfe6ffff7fe30cec91b7f233035fe2e5b510a
Merge "Cleanup for Sahara fields"