am e1650d00: am 85bb3235: am 8eae9223: am a05bd3c1: am 2f47bb53: am eb204f82: am b919a3a3: am 64290793: Merge "Fix integer underflow in ESDS processing" into klp-dev

* commit 'e1650d00185ca1121aceecc236cdea107a8247b0':
  Fix integer underflow in ESDS processing