Port 6346cdb6

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