am e8d692b2: am 06312cf5: Merge "Restore missing min and max API."

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