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

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