Merge "Fix two storage measurement bugs."