[fixed] More npc breech message changes

Change-Id: Ia29e99bcc66eb0ab984564dc0dbd321e725be832