Merge "Refactor compare_images" am: 2ce9bc6563
am: 5e29d2617b

Change-Id: Ie9c007a34ed4a072af94326c582497ea656806e6