Bug: webrtc:10284, webrtc:10653 Change-Id: Ic559421f4f9e6cf4985c08502dc139bd254663ce Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/144541 Reviewed-by: Seth Hampson <shampson@webrtc.org> Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> Cr-Commit-Position: refs/heads/master@{#28512}