Add MockSink to the 1.5 branch.