Merge "Correctly count nri uid request counts"