Merge "IMS: Changes for MultiEndpoint" into nyc-dev