updates to defconfig to sync with CM.