am 25e1af5b: ART: Change merges with Undefined to Undefined

* commit '25e1af5b4e1ce7e03a188ca1d0197a9f5b6acaf8':
  ART: Change merges with Undefined to Undefined