Add option to set flag for storage=0

Change-Id: I46b94d55fc649a2abf27569ccf99aabb2822d663