defconfig updates
fix merge derp

Change-Id: I5a52c40fd896e02ae9d2f8c695731d687bb02a58