Merge "Move the check on multisim support when switch configuration is done"
am: cb73a4a19f

Change-Id: I72918dba6888108390f2ba88ba3ead14a47be088