Merge "Remove over-specified lambda class assertions"