Merge "Make PickerDataLayerTests consistent with master" into sc-mainline-prod