Merge "Fix unittest for blockimgdiff" am: 36bcb78eb9 am: 0e6a7f1838
am: 1b7e203272

Change-Id: Id6db83ef492aec3aba8ef8bf4c00658963ffaef3