Merge "IMS: Changes for MultiEndpoint" into nyc-dev am: f8de70c7b7
am: 8391d839bb

* commit '8391d839bb508be6c21a154f67a9423169e376b0':
  IMS: Changes for MultiEndpoint