Merge "Fix native allocation watermark clamping."