Cleanup recent merge and add PacSwitch Utils

Change-Id: Ic37b79c3976a6205d8b125900ae2f6505b15dca0
Signed-off-by: Lokesh Chamane <lokesh.c703@gmail.com>