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

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