Bug: b/38018041 Change-Id: I8490a8ab51db14d3f4f42e128e47303e3710f63f Reviewed-on: https://chromium-review.googlesource.com/536755 Commit-Queue: Henrik Andreasson <henrika@webrtc.org> Reviewed-by: Minyue Li <minyue@webrtc.org> Cr-Commit-Position: refs/heads/master@{#18629}