This is in preparation of increasing the superblock size. Change-Id: I9197e397399fbe8aec1178a45ea0337dd90412d7