Port 01079cb8

R=hpayer@chromium.org, joransiu@ca.ibm.com, michael_dawson@ca.ibm.com
BUG=
LOG=N

Change-Id: I4b107ecdcd0759296daf6f6eb06b522bdfb36f44
Reviewed-on: https://chromium-review.googlesource.com/c/1340460Reviewed-by: Muntasir Mallick <mmallick@ca.ibm.com>
Commit-Queue: Junliang Yan <jyan@ca.ibm.com>
Cr-Commit-Position: refs/heads/master@{#57586}