Merge "Adds support for specifying the version of a service to register/lookup." am: c3d8550cf3 am: 8bd63a39f3 am: 63f0ebc7a8
am: 525489b087

Change-Id: I00eb3f6e26fbb01592d09d581488a903f17a4fa4