am: 0e3aff1 * commit '0e3aff1ab5c0cf0bb200910b10a81173d6d607a5': IMS: Changes for MultiEndpoint
0e3aff1