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

Change-Id: I18bc4eef3f67508822398d715deeb71145f4cf1b