Port 0c296cb2

Change-Id: Ic90f248e05a668cfda6f6a86772dcabbc5275ec0
Reviewed-on: https://chromium-review.googlesource.com/1228034Reviewed-by: Sreten Kovacevic <skovacevic@wavecomp.com>
Commit-Queue: Sreten Kovacevic <skovacevic@wavecomp.com>
Cr-Commit-Position: refs/heads/master@{#55960}