[INTERNAL] m.Switch: remove unnecessary if statement

Change-Id: I3465887531fe5047f5d094584733a056898e8702
Merge "[INTERNAL] m.Switch: remove unnecessary if statement"