Merge "Revert "Adding custom image for ONU race condition debug""