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

* commit '8eae9223b61b9290b584dcbe634693964bac4bf8':
  Fix integer underflow in ESDS processing