am 127b478a: Merge "Remove all usage of fmin and fmax" into mnc-dev

* commit '127b478ac61eed99894998b38bca82b79b8e56b1':
  Remove all usage of fmin and fmax