[Changed] Some coordinates on npc's

Change-Id: If6bb302a7c6d647b094a4791cdae1836d6bb6b27
Merge "[Changed] Some coordinates on npc's" into unstable