Replace deprecated Block::infinity (1.18)

Change-Id: I371b7fd2c3f1485d0aadca92670d6009456beeea