Update DefConfigs

Change-Id: If46948f6d20259ac264043f00b5a88415017ff3d