am a41555f1: am 75c45871: Merge "Restore missing min and max API."

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