Proper handling for block level frameless images

Change-Id: Idd438dd256e1877ee7c18b8286a2c32fe2326f23