Replace mox with mock in tests.storage

Change-Id: I912c999567eba012eb1777f937d1a5785a720d54
Merge "Replace mox with mock in tests.storage"