Implement support for RPC Versioning

Change-Id: Ied234ed2ca691feb4bfe35450a701230db186364