Show STDOUT if STDERR is empty on error

Change-Id: I1115a9e19152ab6f017714e0c0d47894f86fdf1c
Merge "Show STDOUT if STDERR is empty on error"