am a73fab60: Merge "Restore missing min and max API."

* commit 'a73fab6004b7360d27639a42874fd1d94c701b6b':
  Restore missing min and max API.