Merge "Properly initialize segmentID in nonrd coding path"