Merge "Modified MultiSim APIs"
am: b5251792d4

Change-Id: I85f39ab94d922aa79c75ee444d776bba79c6cf2e