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