Default is not necessary for toggle fields

Change-Id: Ia11290431bc19905f744b65b001adc53c023e2ca
Merge "Default is not necessary for toggle fields"