am d7c920ce: am 606a81aa: Merge "Ensure HCondition nodes on objects are either HEqual or HNotEqual"

* commit 'd7c920cea58ce41afcd1527d9bc58c99901ced9e':
  Ensure HCondition nodes on objects are either HEqual or HNotEqual