Convert to switches [2/2]

Change-Id: I013d631783718cada7591a3b14a4d2aecfb740a0