Merge "Restrict MAC randomization suggestion API to S" into sc-dev