Merge "storaged: Avoid divide-by-zero in performance measurement"