am 20a5df62: am bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev

* commit '20a5df6205c3d57bfcb5b8e1454fb88c638c8ae3':
  Fix incorrect condition for sub id check.