Fixing default values

Change-Id: I75c907cecd22c13219bf8cdff83c3152a127e20a