Replacing long block size enum values with shorter ones (2). Change-Id: I428c4d42212b757112e3acfe5b81314cfbb5fd6b