M35 gardening.

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

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

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

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

I'm not sure about my OS X changes, though.

TBR=darktears