Merge "42661: Split API check constant warnings into a separate issue"