Update storage

Change-Id: If5910289dcf5f4d72421f3a4ee7c92b30b4c0b31