Track OmniSwitch again

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