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

Change-Id: Ie8d28274ffe81fd6d9e1ce027b07af8069bce478