Merge "Reset IMS Capabilities when IMS disconnects" into oc-dev
Brad Ebinger [Fri, 12 May 2017 20:07:23 +0000 (20:07 +0000)]

Trivial merge