Remove version from getService/registerAsService(). am: 097a767ec6
am: 00ad427991

Change-Id: I7cd0c408964ac22db8d79541ef808a36c8cc3ace