am 17fe95ef: (-s ours) am 83d9692e: Restore missing min and max API.

* commit '17fe95efd11a44e6c1607a75ff37fc878fdcec7e':