Merge "Fix unittest for blockimgdiff"