Port 7a159da1

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

Change-Id: I669b665d7ef00dc6dcc80936d460e12c80bc1eb6
Reviewed-on: https://chromium-review.googlesource.com/818123Reviewed-by: Joran Siu <joransiu@ca.ibm.com>
Reviewed-by: Igor Sheludko <ishell@chromium.org>
Commit-Queue: Junliang Yan <jyan@ca.ibm.com>
Cr-Commit-Position: refs/heads/master@{#50042}