Merge "Refactor CompareResult<> class and its call sites" am: 60eae6e621 am: 89deab16f3
am: c345562746

Change-Id: I850f2ceab5949c2fceba5d25eda639a319efa7b3