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

* commit '52047ab160629275f77d9dba6d69eb223986bdda':
  Fix overflow/underflow problem in comparison