fixup
M35 gardening.

CL: https://codereview.chromium.org/183743021
M35 gardening.

CL: https://codereview.chromium.org/135013008
M35 gardening.

CL: https://codereview.chromium.org/180633008

I'm not sure if this change is correct, and we seem to be duplicating stuff
from Chromium (and obviously deviating from it).

TBR=li.yin@intel.com