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

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