[fixed] Spynet NPC location

Change-Id: Ie54b2064b908ecab9aec3b095b3b8ed2c1d21270
Merge "[fixed] Spynet NPC location" into unstable