Merge "Fix native allocation watermark clamping." into lmp-dev