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

* commit 'db1a1a8c6dc0c4e93a3a0e6cae96feda8c6ae53c':
  Tune heuristics a bit.