BUG= R=tkchin@webrtc.org Review URL: https://codereview.webrtc.org/1829783003 . Patch from Jon Hjelle <hjon@webrtc.org>. Cr-Commit-Position: refs/heads/master@{#12128}
BUG= NOTRY=True Review URL: https://codereview.webrtc.org/1801943003 Cr-Commit-Position: refs/heads/master@{#12079}