Merge "Fix multisim issue with sim call manager." am: fce9a3a4b3 am: 042abfe688
am: df3a2709de

Change-Id: I1046171c00fbc426dffa897ad4634446518b4a47