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

* commit 'e1a8662792260953efe05fd991d945e508298aa8':
  Fix native allocation watermark clamping.