[automerger skipped] Merge "Modified MultiSim APIs" am: b5251792d4 am: ac68e17487
am: 6ddf54d2c2 -s ours
am skip reason: change_id I7d6801c98ef6f641e7dfee7303aae6cfbdf90839 with SHA1 0ea7d78545 is in history

Change-Id: I3647463d4d3bba6f896a7c75c44d7d25204bbb53