this too will make it easier to make the streams async. Change-Id: I9a961fc667042e0aed23d2241326f1ea719bc7a4