Merge "Get rid of setupDataCallWithProtocol."