Port c52b7af5

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

Change-Id: I75ec0305f618336ce63fb664ae356dfcf48948c4
Reviewed-on: https://chromium-review.googlesource.com/1075468Reviewed-by: Joran Siu <joransiu@ca.ibm.com>
Commit-Queue: Junliang Yan <jyan@ca.ibm.com>
Cr-Commit-Position: refs/heads/master@{#53417}