Merge "Revert "Measure commitMasterChanges() run time""