Merge "Fix sdnc core build failure"