Merge "Revert "Revert "Prevent double application of min rate in two pass."""
authorPaul Wilkins <paulwilkins@google.com>
Thu, 6 Sep 2018 14:23:54 +0000 (14:23 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 6 Sep 2018 14:23:54 +0000 (14:23 +0000)

Trivial merge