Fix regression introduced by b9c0ece

Fix partially broken brick ownership change introduced by b9c0ece.
Fix brick shatter health check