Merge "Feature flag for stopping restricted profiles"