Merge "Annotate @MacRandomizationSetting in API param" into sc-dev