Merge "Change fields in ShardStats to non-volatile"