Move to billingstack.storage

Change-Id: I64979139fc99bc1e6c7c27e64e4ecdddf169eb26