am 8af5cd51: am 229833c3: Merge "Fix invalid conditional check." into lmp-dev

* commit '8af5cd512a7d71834e8d31b8b7d6240abe334699':
  Fix invalid conditional check.