Merge "Adding custom image for ONU race condition debug"