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

Change-Id: I3d463e29d8ba806d69596bee64234a28d0c6f34d