update switchable pair patch

Change-Id: I6012480dc2377c726bdbbba5375337e98e89db42