Merge "Adds support for specifying the version of a service to...
Merge "Adds support for specifying the version of a service to register/lookup." am: c3d8550c am: 8bd63a39 am: 63f0ebc7
am: 525489b0
Change-Id: I00eb3f6e26fbb01592d09d581488a903f17a4fa4