am d85bd526: Merge "resolved conflicts for merge of 9ef2ec9b to lmp-dev-plus-aosp" into lmp-dev-plus-aosp

* commit 'd85bd5266effc37650c38e90033ffca2214e86aa':
  Remove errors/warnings from tautological comparisons.