Merge "Fix sdnc/oam staging build"