am 8f5fbd01: (-s ours) am b7f05114: Restore missing min and max API.

* commit '8f5fbd0165ed6ff9bb32e68957120eff659efb85':