Merge "Mitigate time outs from ImageDecoderTest"