BUG= Review URL: https://codereview.webrtc.org/1696673003 Cr-Commit-Position: refs/heads/master@{#11872}
BUG= R=tkchin@webrtc.org Review URL: https://codereview.webrtc.org/1559753002 . Patch from Jon Hjelle <hjon@andyet.net>. Cr-Commit-Position: refs/heads/master@{#11348}