Merge "storaged: Fix bug in empty check"