Merge "Modified RpcResultBuilder classes to be Serializable"