Original commit d67d91db

Change-Id: I2787a090e8794b91a7f08635ce73f925e1021477
Reviewed-on: https://chromium-review.googlesource.com/1188317Reviewed-by: Michael Starzinger <mstarzinger@chromium.org>
Commit-Queue: Sreten Kovacevic <skovacevic@wavecomp.com>
Cr-Commit-Position: refs/heads/master@{#55396}