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

Change-Id: I00c3d6441f15011a6ddbb281169bfcac71aff062