Merge "Add checks on multisim capabilities." am: 862821ede5
am: 811e1165c2

Change-Id: I37939825d83107fd45db6c1ffef8e28f2b48704c