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

Change-Id: I9476518dbb93b10a30a087737d82ce23d80fcc4d