am 085cb2d2: Merge "Fix broken logic in isValidTarget" into lmp-dev

* commit '085cb2d2f23ee497ddfb94b970da27d782b49dc0':
  Fix broken logic in isValidTarget