Port 15c31fe4

Change-Id: Ia611585f862196d97e701b5e15560044e42b1a12
Reviewed-on: https://chromium-review.googlesource.com/c/1306439Reviewed-by: Sigurd Schneider <sigurds@chromium.org>
Commit-Queue: Ivica Bogosavljevic <ibogosavljevic@wavecomp.com>
Cr-Commit-Position: refs/heads/master@{#57128}