Merge "storaged: test do not crash on cuttlefish."