Defconfig update #2

Change-Id: I49f8108e17248fb28baec226c593c0f39a2d58b5