Merge "Fix ResumeOnRebootServiceProviderTests"