Defconfig update

Change-Id: Ie2d1598538b41df427b380fc0df9cd80d78bc7c8