Modify kStorageConditions return type.
Merge remote-tracking branch 'origin/models' into models