Bug: webrtc:12035,webrtc:12036 Change-Id: I774f640a96b80e4942e4166f69475fe47f1bd0ea Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/189801 Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Commit-Queue: Olga Sharonova <olka@webrtc.org> Cr-Commit-Position: refs/heads/master@{#32451}