Simon Hunt
Committed by Gerrit Code Review

Replace comparator definitions with their Lambda equivalents.

Change-Id: Ib626e086f78aa950be20cb84e56a3769517bac0a