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

Change-Id: I25a4340bd391be486929213ce0500707b7ce073e