merge qsd8k-common into supersonic

Change-Id: Ifb3097796828387cf2df61cbe8dd73fe3d0910b1