Build fix the errors from merging Sniper- fixes for assert device.

Signed-off-by: travp624 <travp624@gmail.com>