(cherry picked from commit d9f20316

)

# Conflicts:
#	x/gamm/pool-models/balancer/amm_test.go

Co-authored-by: Dev Ojha <ValarDragon@users.noreply.github.com>