Storage notification changes

Change-Id: I68b81a18d0ad9777424a1d54ae26116495bfc9e7