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

Change-Id: Ibcd182dd24ebb5f62918e7e71d7b3f69ae845dd9