Pass storage object where required

Test: npm run build:all && npm run test:all
Change-Id: I3da6b4c0a10a0c17c961820a06fc7d849fce8b59
16 files changed