am f470eb88: Merge "ART: Change merges with Undefined to Undefined"

* commit 'f470eb88cc3d3654f0fb1ca38622fa3a35fbd8a3':
  ART: Change merges with Undefined to Undefined