Merge "Fixup to have /dev/diag allowed to 'diag' group" into private_redfox64_mbf_111