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

* commit '2f47bb53f65e34ba9cff66106390351440b9409b':
  Fix integer underflow in ESDS processing