Merge "Refactor compare_images" am: b33008068f
am: 6fd47e136a

Change-Id: Id3d96ebaf5b4f131c482753b086de91788dfc78e