Merge "Modified MultiSim APIs" am: b5251792d4
am: ac68e17487

Change-Id: I12a305d1cbe25ff5da6474f041271487fce82f3f