storage1 decom, storage2 decom

Change-Id: Ie242e126ed0cb283fe75dd7f2ffcea39fe238757