Merge "Remove unneeded print APIs and update the min margins APIs." into klp-dev