Merge "Update coverage reporting for BPGen"