Incorporated corrections from webrtc-eng