Merge "Revert "DiskStats Westworld Migration""