switch to d2-common, add 3.4 wcnss