Merge "Fix potential size overflow in blockimg.cpp" am: 9a54dd3bf9
am: cc025b2b4a

Change-Id: Iba39c6bd6e4e0b4e0576f7b82662439794b1d2fc