defconfig updates

Change-Id: I2887daed746e28c7362e666f9fa7d2c4cfffba6f