Merge "Make StreamRedirector try to exhaust itself before exiting" am: 13cd3f2bfc am: 07dc739759
am: c51b82b3f9

Change-Id: I007ef9b1960f244ac2ea6433d5cd63363b6bd05c