Update to support new handover config method for p4.0