Updated defconfig to reflect changes

Change-Id: I87954f36960b886d72ef37e98cab3c5788586928