Fix the order in which the defaults are set. This will set Gummy Defaults

Change-Id: I31aca326c5f13aa1f88944cb681f591233256fa2