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

Change-Id: I785b1213baeeba67369f2ff1ca5e51a11b1a4da7