Apply previous configs to new defconfig

Change-Id: I13d84a22861f3d6231e115d3c1fb9a45d0d0b142