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

* commit '96b638fd6271d9a2ac1bfae2e89db06f64b50bb6':
  ART: Do not abort on exception in CreatePeer