Make storage performance SUCK LESS

Change-Id: Id254486a65e8a4aad5971539c9292ca404176345