dsp: merge from shooter

Change-Id: I535f6cc1e66aa0e61ee9342e9ad9203b5b233378