Merge "Fix NPE in usage stats manager (recent regression)" into oc-dev