Merge "Modified MultiSim APIs" am: c5461c4490
am: be4d9657a7

Change-Id: I9aa4e0231b7f546f8e26ba9a77c20f4e4a89dc86