Merge "Remove errors/warnings from tautological comparisons." into lmp-dev