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

Change-Id: Ia2f821718091a91b0aa18c3a0984465b8bc9143b