Merge "imgdiff: Fix an edge case that leads to infinite loop." am: 3b828d879b am: 4d37763c69
am: e513c0f2ac

Change-Id: I24c52efcf8cd5055af9602dd6bc9b40f029816f9