Merge "Add tracing points to StorageManagerService" into main