Take version into consideration in GetServiceName am: 51bdaee264 am: ca4d41d6e5
am: 9a38afd77b

Change-Id: I1b56c8cff3b2df564df88b4f614adb22107af910