am 23bccc74: Merge "Update expectations for XML test failures."

* commit '23bccc74b67a6e8d94988edfe214e5798551713b':
  Update expectations for XML test failures.