Merge "Modified MultiSim APIs"
am: c5461c4490

Change-Id: I12da49b887202f340be7f1a290bdc8c99863eac0