am b417986c: am d1c08d6b: am efa73c2e: am 2e24d091: am a59d5e66: am 8ef5da3d: am 4dd7cb69: Fix integer underflow in ESDS processing

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