Merge "Address MAC randomization API council feedback" into sc-dev