am 41e4d8b3: am 0c218e43: am 9ca926ad: am fdb87b76: am 127b478a: Merge "Remove all usage of fmin and fmax" into mnc-dev

* commit '41e4d8b3ed044ed724bc340b77d3f9ca60105407':
  Remove all usage of fmin and fmax