Fix storage overlay

Change-Id: I92d19c241504a73947e1ff07cf9f941f6e15cf34