Merge "Fix resetServiceForTesting() param type in comment"