Merge "Revert "Cherry Pick https://codereview.chromium.org/65273002/ PS 8"" into klp-dev