[BUGFIX] handle lazyObjectStorages old fashion

Change-Id: Ib146944d84a8da44dc184ff6e3247fba00d23830