Take version into consideration in GetServiceName
am: 51bdaee264

Change-Id: Id47d92eb7bd0b73536d31bcc6c75aa31e2849769