Multiple policies fix  for DeviceCommandController