Merge "Add new "max-sdk-p blacklist"."