[fixed] Missing NBZ on Tat

Change-Id: I8986f3ceb1219875e31ff566bd77ac469a4a251a
[fixed] Mantis 4026:  Panic Shot delay from 30s to 10s

Change-Id: Ibd58cf1f5e618073041993f954e4f7f4ecc708df
Merge "[fixed] Mantis 4026:  Panic Shot delay from 30s to 10s" into unstable