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

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