This change addresses following: 1. Add new classes for comp. bypass. 2. Remove comp. bypas specific code from exisiting flow. Change-Id: Id9424b42a9a113cfbb18ceac8d59bbe07ea8e773