Merge "Update folder asset usage"