Merge "Support termination of a call while merge is in process." into mnc-dev
Tyler Gunn [Thu, 23 Jul 2015 17:49:26 +0000 (17:49 +0000)]

Trivial merge