am 80d3f4f0: Merge "ART: Do not abort on exception in CreatePeer"

* commit '80d3f4f00e2494f0311f04e8379497ec75376d46':
  ART: Do not abort on exception in CreatePeer