This CL is analogous to CL #120904. Bug: webrtc:10314 Change-Id: Ia885a2614236f634bea934e94cfc5cc719e36792 Reviewed-on: https://webrtc-review.googlesource.com/c/122841 Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> Reviewed-by: Mirta Dvornicic <mirtad@webrtc.org> Commit-Queue: Elad Alon <eladalon@webrtc.org> Cr-Commit-Position: refs/heads/master@{#26753}