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

Change-Id: I002d5aae7bf8d6e14ba5b4882a3fdd8b4f93f555