Merge "Add BidirectionalStreamCallback util class"