am 322e3602: Merge "Fix integer underflow in ESDS processing"

* commit '322e36021f26b7d7a288c7c63040cfb3a976679d':
  Fix integer underflow in ESDS processing