Update Defconfigs

Change-Id: Ica94d98c3e2bd69021668a73d1c1eaf1f03bc8df