Merge "Restore missing min and max API." into mnc-dev