[fixed] mantis 3654 area attacks consume only one pup

Change-Id: I39ebb903f6c12cd30464503a225bef5c5c40438c
Merge "[fixed] mantis 3654 area attacks consume only one pup" into unstable