Back up partial change in r48072 in order to fix chromium reliability build break.