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

Change-Id: Idb27a2adab7b857242b13cb0a25e0b8d6c480ee1