Address API changes in Storage 8.5 upgrade
Address API changes in Storage 8.5 upgrade

ColinScott/LightBlue,LightBlueProject/LightBlue,ColinScott/LightBlue,LightBlueProject/LightBlue,ColinScott/LightBlue,LightBlueProject/LightBlue