[Added] more protection agains double spawning of the old man.

Change-Id: I0046d35bf6131df3b52c1aca5833c69bf356c85b
Merge "[Added] more protection agains double spawning of the old man." into unstable