Serialize default value for DataItem if it is optional

Change-Id: I1a13283c1fa8fe125f13f5dd71284fca65b88dd6