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

Change-Id: I014c72da4c622bb9dfc411d6c624e4937d017e2b