am 1c2f38b9: am a13d2e11: Merge "ART: Do not abort on exception in CreatePeer" into mnc-dr-dev

* commit '1c2f38b9795138b4afb6736003558a989e433b03':
  ART: Do not abort on exception in CreatePeer