Update defconfigs

Change-Id: I24dce3c5ab9d2df00fcdc009d7edbdf5db6dd0b1