[SDNC-5] Rebase SDN-C oam