Merge "ND Context Builder Updates for port/p-interface"