Merge "Ensure UidStats is not null when needed." into sc-dev