GitLab

Make whitespace use in this routine sane: remove trailing whites and use
space characters, except for Jeff's modifications (tab prefixed).

Minor: roll up our QCMS changes to here in google.patch.

BUG=458024

Review URL: https://codereview.chromium.org/1021593002

Cr-Commit-Position: refs/heads/master@{#321214}