Merge "Throttle fetching RPM stats" into oc-mr1-dev