Defconfig merge derp

Change-Id: I470ebec0c5bbf6196e3636cb858cd6367f7a06d6