am eb204f82: am b919a3a3: am 64290793: Merge "Fix integer underflow in ESDS processing" into klp-dev

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