Update configs and kernel modules

Change-Id: I1009b4fa236f358042bb80a40fb516bca7a39484