defconfig updates

Change-Id: Ia1650bd297f9ee409e9eeb9dfe50986d2ae82fd0