Merge "Tune heuristics a bit." am: e35764f1f8
am: c2ef5aae7f

* commit 'c2ef5aae7faa1e559b8bf4dc31d94876dd4b0c14':
  Tune heuristics a bit.