Merge "Add MAC randomization feature flag"