am 1d0989b6: Merge "Quit using weightChildNode for ADDITIONAL_PROXIMITY and SUBSTITUTION."

* commit '1d0989b65cb0ee93a70dc479476025038aa720f5':
  Quit using weightChildNode for ADDITIONAL_PROXIMITY and SUBSTITUTION.