Merge "[dice] Adjust the output type of make_sample_bcc_and_cdis()"