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

* commit '6429079345404932c5be5956efc7154390d2ed0e':
  Fix integer underflow in ESDS processing