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

* commit '41fd9f8af6b93daec54dc3945f7c2809f67a5c79':
  Fix broken logic in isValidTarget