Merge "Don't generate RC entries for filterable log types"