Port a55d8632

Original Commit Message:

    Its contents are now inlined into the one remaining call site.

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

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