Merge "Extract code into methods from recordMeasurementsForAllPackages"