revision of class MapServices

Change-Id: Icc31b2eff35c42db6c4e13b8f0390d5c55e10bbd
Merge "revision of class MapServices"