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

Change-Id: If295a4876c00226ef8a547e43bd18e2742a6f3b2