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

Change-Id: Ibb50f4ad86d658d9cb8857164bfb3d33dfc4e482