Merge "Add update-expected-xml call"