Merge "Add security check for clearDeviceInitializer in the service."