Merge "Blacklist CFI unrelated cast issue in protoc generated code"