Ensure Storage Implementions match the Interface

This just covers the storage interface, as reported in bug 1281106

Closes-Bug: 1281106
Change-Id: Ief239ce39e552c5248a0736b0fa1dc3396c3d67a
Merge "Ensure Storage Implementions match the Interface"