Merge "Device*Registry quickfix - add failed"