am 386a5a29: am 396b83b0: Merge "Fix overflow/underflow problem in comparison"

* commit '386a5a2940acd346f1d9e81c87dfa87e7d146065':
  Fix overflow/underflow problem in comparison