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

Change-Id: Ie873607b804a5a7c3f8b7071e50eaa6db1ec8acd