[automerger skipped] Merge "Modified MultiSim APIs" am: c5461c4490 am: be4d9657a7
am: 296e21451d -s ours
am skip reason: change_id Icbd36f714c577a965d39336d54d7224c8c2c7cd2 with SHA1 6e1c1094d8 is in history

Change-Id: I7ef210ecfc9ec21bf5f4eac51d85e43fc6269809