Merge "Fix benign overflow in OMXNodeInstance"