Merge "TIF: Add @NonNull for Programs.Genres.encode/decode" into nyc-dev