Merge "Only fill methods with 0xFE on debug builds" into nyc-dev