Merge "Move the check on multisim support when switch configuration is done" am: 5461b1d23f am: fdcb15a75a
am: 226283a5e4

Change-Id: I9a2185b8a1433b0ba15a8d7a7499b50b87ba273d