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