Merge "Remove yaql call when building logging_groups"