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

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