modify switch

Change-Id: Id62ad13ed88cafa1a44cea90f36743d0cedb379e
Merge "modify switch"