Merge "health.filesystem HAL renamed to health.storage"