Merge "Remove redundant config flags from get_entropy_context" into nextgenv2