Merge "Integrated FactoryResetter with DevicePolicySafetyChecker."