Merge "ResetListener in StorageManagerService"