
I was not able to reproduce chromium:1146676 locally, so the change in merge.cc is a speculative fix. Bug: chromium:1146835, chromium:1146676, chromium:1137226 Change-Id: I14472ba5b41e58b2d5f27d9833249c14505af18f Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/194264 Commit-Queue: Ivo Creusen <ivoc@webrtc.org> Reviewed-by: Henrik Lundin <henrik.lundin@webrtc.org> Cr-Commit-Position: refs/heads/master@{#32759}