Merge "Capture logs when running unit tests"